merge trunk
authorKenichi Handa <handa@m17n.org>
Fri, 20 May 2011 00:42:04 +0000 (09:42 +0900)
committerKenichi Handa <handa@m17n.org>
Fri, 20 May 2011 00:42:04 +0000 (09:42 +0900)
commit31bcb08c2c2ff0dbd186fc64ac01b55c4d790f1a
treea24da001051d6f0cd312ae5871397956b625bf82
parentd9401c991ff14a0a423da422a5c33298eab6acd8
parent6827b337c09a19cfed1535ab4864f0d7446eaf02
merge trunk